Set have_render_with_trapezoids to GDK_YES when we have a new enough

2005-02-20  Matthias Clasen  <mclasen@redhat.com>

	* gdk/x11/gdkdrawable-x11.c (_gdk_x11_have_render_with_trapezoids):
	Set have_render_with_trapezoids to GDK_YES when we have
	a new enough Render extension.  (#167965,Billy Biggs)

diff --git a/ChangeLog b/ChangeLog
index a827090667b06bd5a23a34b31149b9c181f9f6ba..1e573a719a926ee5ee374f48a0427d6d9abbf471 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-02-20  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/x11/gdkdrawable-x11.c (_gdk_x11_have_render_with_trapezoids): 
+       Set have_render_with_trapezoids to GDK_YES when we have 
+       a new enough Render extension.  (#167965,Billy Biggs) 
+
        * gtk/gtkwindow.c (gtk_window_present): Use the timestamp of
        the last user interaction when focusing the window.  (#166379, 
        Elijah Newren)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a827090667b06bd5a23a34b31149b9c181f9f6ba..1e573a719a926ee5ee374f48a0427d6d9abbf471 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2005-02-20  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/x11/gdkdrawable-x11.c (_gdk_x11_have_render_with_trapezoids): 
+       Set have_render_with_trapezoids to GDK_YES when we have 
+       a new enough Render extension.  (#167965,Billy Biggs) 
+
        * gtk/gtkwindow.c (gtk_window_present): Use the timestamp of
        the last user interaction when focusing the window.  (#166379, 
        Elijah Newren)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a827090667b06bd5a23a34b31149b9c181f9f6ba..1e573a719a926ee5ee374f48a0427d6d9abbf471 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,9 @@
 2005-02-20  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/x11/gdkdrawable-x11.c (_gdk_x11_have_render_with_trapezoids): 
+       Set have_render_with_trapezoids to GDK_YES when we have 
+       a new enough Render extension.  (#167965,Billy Biggs) 
+
        * gtk/gtkwindow.c (gtk_window_present): Use the timestamp of
        the last user interaction when focusing the window.  (#166379, 
        Elijah Newren)

diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c
index 5dc9a40bde195f63dff28aa85b387aa86acc72cd..d397911883b4f7d784ad98ff99efe3738d9f929b 100644 (file)
--- a/gdk/x11/gdkdrawable-x11.c
+++ b/gdk/x11/gdkdrawable-x11.c
@@ -336,9 +336,8 @@ _gdk_x11_have_render_with_trapezoids (GdkDisplay *display)
 
   if (x11display->have_render_with_trapezoids == GDK_UNKNOWN)
     {
-      if (!_gdk_x11_have_render (display))
-       x11display->have_render_with_trapezoids = GDK_NO;
-      else
+      x11display->have_render_with_trapezoids = GDK_NO;
+      if (_gdk_x11_have_render (display))
        {
          /*
           * Require protocol >= 0.4 for CompositeTrapezoids support.
@@ -350,10 +349,11 @@ _gdk_x11_have_render_with_trapezoids (GdkDisplay *display)
        
          if (XRenderQueryVersion (xdisplay, &major_version,
                                   &minor_version))
-           if ((major_version < XRENDER_TETRAPEZOIDS_MAJOR) ||
-               ((major_version == XRENDER_TETRAPEZOIDS_MAJOR) &&
-                  (minor_version < XRENDER_TETRAPEZOIDS_MINOR)))
-             x11display->have_render_with_trapezoids = GDK_NO;
+           {
+             if ((major_version == XRENDER_TETRAPEZOIDS_MAJOR) &&
+                 (minor_version >= XRENDER_TETRAPEZOIDS_MINOR))
+               x11display->have_render_with_trapezoids = GDK_YES;
+           }
        }
     }